From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 28 Jan 2021 04:28:36 +0000 (-0500)
Subject: Drop unused logo resource
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1~1^2~83^2^2~470^2~3
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1ac9400712909bbc657f5a57f81deaab20aa8cf7;p=gtk4.git

Drop unused logo resource

The inspector no longer sets a window icon.
---

diff --git a/gtk/gen-gtk-gresources-xml.py b/gtk/gen-gtk-gresources-xml.py
index 3f08c60e80..8072eee9f4 100644
--- a/gtk/gen-gtk-gresources-xml.py
+++ b/gtk/gen-gtk-gresources-xml.py
@@ -86,7 +86,6 @@ for f in get_files('inspector', '.ui'):
   xml += '    <file preprocess=\'xml-stripblanks\'>inspector/{0}</file>\n'.format(f)
 
 xml += '''
-    <file>inspector/logo.png</file>
     <file>inspector/inspector.css</file>
     <file>emoji/en.data</file>
   </gresource>
diff --git a/gtk/inspector/logo.png b/gtk/inspector/logo.png
deleted file mode 100644
index d35178859b..0000000000
Binary files a/gtk/inspector/logo.png and /dev/null differ
diff --git a/tests/testentryicons.c b/tests/testentryicons.c
index 7c91901acf..a39b1c573f 100644
--- a/tests/testentryicons.c
+++ b/tests/testentryicons.c
@@ -46,7 +46,7 @@ set_texture (GtkWidget *button,
 
   if (gtk_check_button_get_active (GTK_CHECK_BUTTON (button)))
     {
-      texture = gdk_texture_new_from_resource ("/org/gtk/libgtk/inspector/logo.png");
+      texture = gdk_texture_new_from_resource ("/org/gtk/libgtk/icons/32x32/places/network-workgroup.png");
       gtk_entry_set_icon_from_paintable (entry, GTK_ENTRY_ICON_SECONDARY, GDK_PAINTABLE (texture));
       g_object_unref (texture);
     }